Fix last change.

diff --git a/src/ChangeLog b/src/ChangeLog
index d3b2ed805d96810856e678fb3441c4b4f2190e79..ff8742f8be5f0f4a746a7ef088123a7cfcea7563 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< ChangeLog
 2009-07-17  Kenichi Handa  <handa@m17n.org>
 
        * casetab.c (shuffle): Fix the logic of setting up the cycle.